From: James Bulpin <james@xensource.com>
Date: Tue, 11 Sep 2007 18:11:02 +0000 (+0100)
Subject: [xm-test] Set "console=xvc0" for xm-test guests on Intel architecture platforms.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14974
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=a3b3c4c98bceafd7d4ab3bfb62d48970a487af11;p=xen.git

[xm-test] Set "console=xvc0" for xm-test guests on Intel architecture platforms.
Tests have been failing because the console for the test ramdisk wasn't using
xvc0 so testcases were not able to interact with it.

Signed-off-by: James Bulpin <james@xensource.com>
---

diff --git a/tools/xm-test/lib/XmTestLib/arch.py b/tools/xm-test/lib/XmTestLib/arch.py
index 0a55a31ae7..654afecb3b 100644
--- a/tools/xm-test/lib/XmTestLib/arch.py
+++ b/tools/xm-test/lib/XmTestLib/arch.py
@@ -70,6 +70,7 @@ ia_ParavirtDefaults = {"memory"       : 64,
                        "kernel"       : ia_getDefaultKernel(),
                        "root"         : "/dev/ram0",
                        "ramdisk"      : getRdPath() + "/initrd.img",
+                       "extra"        : "console=xvc0",
 }
 ia_HVMDefaults =      {"memory"       : 64,
                        "vcpus"        : 1,
@@ -147,7 +148,11 @@ if _arch == "x86" or _arch == "x86_64" or _arch == "ia64":
     # expects one.  This will fail with a gzip-ed image. 
     if configDefaults['ramdisk']:
         rd_size = os.stat(configDefaults['ramdisk']).st_size
-        configDefaults['extra'] = 'ramdisk_size=' + str((rd_size / 1024)+1)
+        clause = 'ramdisk_size=' + str((rd_size / 1024)+1)
+        if configDefaults.has_key('extra'):
+            configDefaults['extra'] = configDefaults['extra'] + " " + clause
+        else:
+            configDefaults['extra'] = clause
 
     if _arch == "ia64":
         minSafeMem = ia64_minSafeMem